testResultEol("", "", "", "", FSMergerBySequence.NOT_MODIFIED); testResultEol("a", "a", "a", "a", FSMergerBySequence.NOT_MODIFIED); testResultEol("abc", "abc", "abc", "abc", FSMergerBySequence.NOT_MODIFIED);
test("", "", "", "", FSMergerBySequence.NOT_MODIFIED); test("a", "a", "a", "a", FSMergerBySequence.NOT_MODIFIED); test("abc", "abc", "abc", "abc", FSMergerBySequence.NOT_MODIFIED);
	public void testBasic() throws Throwable {		// Not modified		testResultEol("", "", "", "", FSMergerBySequence.NOT_MODIFIED);		testResultEol("a", "a", "a", "a", FSMergerBySequence.NOT_MODIFIED);		testResultEol("abc", "abc", "abc", "abc", FSMergerBySequence.NOT_MODIFIED);		// Merged ...		testResultEol("abc", "xbc", "aby", "xby", FSMergerBySequence.MERGED);		testResultEol("abcd", "xbcd", "abyd", "xbyd", FSMergerBySequence.MERGED);		testResultEol("abc", "xbc", "ac", "xc", FSMergerBySequence.MERGED);		testResultEol("abc", "xabc", "abc", "xabc", FSMergerBySequence.MERGED);		testResultEol("abc", "abcx", "abc", "abcx", FSMergerBySequence.MERGED);		testResultEol("abc", "axxxbc", "abc", "axxxbc", FSMergerBySequence.MERGED);		testResultEol("abc", "axxxbc", "abyyyc", "axxxbyyyc", FSMergerBySequence.MERGED);		testResultEol("abcde", "xaxbcxxxdex", "abyycdyyyye", "xaxbyycxxxdyyyyex", FSMergerBySequence.MERGED);		testResultEol("The base line.", "The changed base-line.", "The base line with changes.", "The changed base-line with changes.", FSMergerBySequence.MERGED);		testResultEol("abcd", "abxcd", "abcxd", "abxcxd", FSMergerBySequence.MERGED);		testResultEol("abcd", "axbcd", "abxcyd", "axbxcyd", FSMergerBySequence.MERGED);		testResultEol("abcde", "abxcdez", "abcxdyez", "abxcxdyez", FSMergerBySequence.MERGED);		// Unreal conflicts		testResultEol("abc", "abx", "abx", "abx", FSMergerBySequence.NOT_MODIFIED);		testResultEol("abc", "ab", "ab", "ab", FSMergerBySequence.NOT_MODIFIED);		testResultEol("abc", "b", "b", "b", FSMergerBySequence.NOT_MODIFIED);		testResultEol("abc", "", "", "", FSMergerBySequence.NOT_MODIFIED);		// Real Conflicts ...		testResultEol("abc", "axc", "ayc", "a>x=y<c", FSMergerBySequence.CONFLICTED);		testResultEol("abc", "axxc", "ayc", "a>xx=y<c", FSMergerBySequence.CONFLICTED);		testResultEol("abc", "axxxc", "ayc", "a>xxx=y<c", FSMergerBySequence.CONFLICTED);		testResultEol("abc", "axxxc", "ayyc", "a>xxx=yy<c", FSMergerBySequence.CONFLICTED);		testResultEol("abc", "xbc", "yby", ">x=y<by", FSMergerBySequence.CONFLICTED);		testResultEol("abc", "xbc", "bc", ">x=<bc", FSMergerBySequence.CONFLICTED);		testResultEol("abc", "xbc", "", ">xbc=<", FSMergerBySequence.CONFLICTED);		testResultEol("abc", "xbc", "bc", ">x=<bc", FSMergerBySequence.CONFLICTED);		testResultEol("abc", "axxxbc", "aybyyyc", "a>xxx=y<byyyc", FSMergerBySequence.CONFLICTED);		testResultEol("abc", "axxxbc", "ayyyyc", "a>xxxb=yyyy<c", FSMergerBySequence.CONFLICTED);		testResultEol("abcd", "ybcd", "xabcd", ">y=xa<bcd", FSMergerBySequence.CONFLICTED);		testResultEol("abcd", "xbcxxd", "ybcdyyy", ">x=y<bcxxdyyy", FSMergerBySequence.CONFLICTED);		testResultEol("abcdefg", "xxxdxxx", "abyyyfg", ">xxxdxxx=abyyyfg<", FSMergerBySequence.CONFLICTED);		testResultEol("abcdefghijk", "xxxdxxxhxxx", "abyyyfyyyjk", ">xxxdxxxhxxx=abyyyfyyyjk<", FSMergerBySequence.CONFLICTED);		testResultEol("abcdefghijklmnop", "xxxdxxxhixklmxoxxx", "abyyyfghijkymyo", ">xxxdxxx=abyyyfg<hixkym>x=y<o>xxx=<", FSMergerBySequence.CONFLICTED);		testResultEol("Some base text", "Many changes to the base", "Confusing the base text", ">Many changes t=C<o> th=nfusing th<e base", FSMergerBySequence.CONFLICTED);	}