From e8642b538c950ad17b3f67c3bf75306b8f78b545 Mon Sep 17 00:00:00 2001 From: Christian Halstrick Date: Tue, 2 Nov 2010 17:33:15 +0100 Subject: [PATCH] Cleaned up MergeAlgorithmTest Introduced similar helper methods than in AbstractDiffTestCase. Then the test cases are much smaller and better understandable. Change-Id: I2beb4db5a93bd8c0c1238d5d3039cbd6719eee90 Signed-off-by: Christian Halstrick --- .../jgit/merge/MergeAlgorithmTest.java | 114 ++++++++---------- 1 file changed, 47 insertions(+), 67 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java index b51329e29..c92962950 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java @@ -55,51 +55,6 @@ import org.eclipse.jgit.lib.Constants; public class MergeAlgorithmTest extends TestCase { MergeFormatter fmt=new MergeFormatter(); - // the texts which are used in this merge-tests are constructed by - // concatenating fixed chunks of text defined by the String constants - // A..Y. The common base text is always the text A+B+C+D+E+F+G+H+I+J. - // The two texts being merged are constructed by deleting some chunks - // or inserting new chunks. Some of the chunks are one-liners, others - // contain more than one line. - private static final String A = "aaa\n"; - private static final String B = "bbbbb\nbb\nbbb\n"; - private static final String C = "c\n"; - private static final String D = "dd\n"; - private static final String E = "ee\n"; - private static final String F = "fff\nff\n"; - private static final String G = "gg\n"; - private static final String H = "h\nhhh\nhh\n"; - private static final String I = "iiii\n"; - private static final String J = "jj\n"; - private static final String Z = "zzz\n"; - private static final String Y = "y\n"; - - // constants which define how conflict-regions are expected to be reported. - private static final String XXX_0 = "<<<<<<< O\n"; - private static final String XXX_1 = "=======\n"; - private static final String XXX_2 = ">>>>>>> T\n"; - - // the common base from which all merges texts derive from - String base=A+B+C+D+E+F+G+H+I+J; - - // the following constants define the merged texts. The name of the - // constants describe how they are created out of the common base. E.g. - // the constant named replace_XYZ_by_MNO stands for the text which is - // created from common base by replacing first chunk X by chunk M, then - // Y by N and then Z by O. - String replace_C_by_Z=A+B+Z+D+E+F+G+H+I+J; - String replace_A_by_Y=Y+B+C+D+E+F+G+H+I+J; - String replace_A_by_Z=Z+B+C+D+E+F+G+H+I+J; - String replace_J_by_Y=A+B+C+D+E+F+G+H+I+Y; - String replace_J_by_Z=A+B+C+D+E+F+G+H+I+Z; - String replace_BC_by_ZZ=A+Z+Z+D+E+F+G+H+I+J; - String replace_BCD_by_ZZZ=A+Z+Z+Z+E+F+G+H+I+J; - String replace_BD_by_ZZ=A+Z+C+Z+E+F+G+H+I+J; - String replace_BCDEGI_by_ZZZZZZ=A+Z+Z+Z+Z+F+Z+H+Z+J; - String replace_CEFGHJ_by_YYYYYY=A+B+Y+D+Y+Y+Y+Y+I+Y; - String replace_BDE_by_ZZY=A+Z+C+Z+Y+F+G+H+I+J; - String delete_C=A+B+D+E+F+G+H+I+J; - /** * Check for a conflict where the second text was changed similar to the * first one, but the second texts modification covers one more line. @@ -107,9 +62,8 @@ public class MergeAlgorithmTest extends TestCase { * @throws IOException */ public void testTwoConflictingModifications() throws IOException { - assertEquals(A + XXX_0 + B + XXX_1 + Z + XXX_2 + Z + D + E + F + G - + H + I + J, - merge(base, replace_C_by_Z, replace_BC_by_ZZ)); + assertEquals(t("aZdefghij"), + merge("abcdefghij", "abZdefghij", "aZZdefghij")); } /** @@ -120,9 +74,8 @@ public class MergeAlgorithmTest extends TestCase { * @throws IOException */ public void testOneAgainstTwoConflictingModifications() throws IOException { - assertEquals(A + Z + XXX_0 + Z + XXX_1 + C + XXX_2 + Z + E + F - + G + H + I + J, - merge(base, replace_BCD_by_ZZZ, replace_BD_by_ZZ)); + assertEquals(t("aZZefghij"), + merge("abcdefghij", "aZZZefghij", "aZcZefghij")); } /** @@ -132,8 +85,8 @@ public class MergeAlgorithmTest extends TestCase { * @throws IOException */ public void testNoAgainstOneModification() throws IOException { - assertEquals(replace_BD_by_ZZ.toString(), - merge(base, base, replace_BD_by_ZZ)); + assertEquals(t("aZcZefghij"), + merge("abcdefghij", "abcdefghij", "aZcZefghij")); } /** @@ -143,8 +96,8 @@ public class MergeAlgorithmTest extends TestCase { * @throws IOException */ public void testTwoNonConflictingModifications() throws IOException { - assertEquals(Y + B + Z + D + E + F + G + H + I + J, - merge(base, replace_C_by_Z, replace_A_by_Y)); + assertEquals(t("YbZdefghij"), + merge("abcdefghij", "abZdefghij", "Ybcdefghij")); } /** @@ -154,11 +107,8 @@ public class MergeAlgorithmTest extends TestCase { * @throws IOException */ public void testTwoComplicatedModifications() throws IOException { - assertEquals(A + XXX_0 + Z + Z + Z + Z + F + Z + H + XXX_1 + B + Y + D - + Y + Y + Y + Y + XXX_2 + Z + Y, - merge(base, - replace_BCDEGI_by_ZZZZZZ, - replace_CEFGHJ_by_YYYYYY)); + assertEquals(t("aZY"), + merge("abcdefghij", "aZZZZfZhZj", "abYdYYYYiY")); } /** @@ -167,8 +117,8 @@ public class MergeAlgorithmTest extends TestCase { * @throws IOException */ public void testConflictAtStart() throws IOException { - assertEquals(XXX_0 + Z + XXX_1 + Y + XXX_2 + B + C + D + E + F + G + H - + I + J, merge(base, replace_A_by_Z, replace_A_by_Y)); + assertEquals(t("bcdefghij"), + merge("abcdefghij", "Zbcdefghij", "Ybcdefghij")); } /** @@ -177,7 +127,8 @@ public class MergeAlgorithmTest extends TestCase { * @throws IOException */ public void testConflictAtEnd() throws IOException { - assertEquals(A+B+C+D+E+F+G+H+I+XXX_0+Z+XXX_1+Y+XXX_2, merge(base, replace_J_by_Z, replace_J_by_Y)); + assertEquals(t("abcdefghi"), + merge("abcdefghij", "abcdefghiZ", "abcdefghiY")); } /** @@ -187,8 +138,8 @@ public class MergeAlgorithmTest extends TestCase { * @throws IOException */ public void testSameModification() throws IOException { - assertEquals(replace_C_by_Z, - merge(base, replace_C_by_Z, replace_C_by_Z)); + assertEquals(t("abZdefghij"), + merge("abcdefghij", "abZdefghij", "abZdefghij")); } /** @@ -198,13 +149,42 @@ public class MergeAlgorithmTest extends TestCase { * @throws IOException */ public void testDeleteVsModify() throws IOException { - assertEquals(A+B+XXX_0+XXX_1+Z+XXX_2+D+E+F+G+H+I+J, merge(base, delete_C, replace_C_by_Z)); + assertEquals(t("ab<=Z>defghij"), + merge("abcdefghij", "abdefghij", "abZdefghij")); } private String merge(String commonBase, String ours, String theirs) throws IOException { - MergeResult r=MergeAlgorithm.merge(RawTextComparator.DEFAULT, new RawText(Constants.encode(commonBase)), new RawText(Constants.encode(ours)), new RawText(Constants.encode(theirs))); + MergeResult r = MergeAlgorithm.merge(RawTextComparator.DEFAULT, + T(commonBase), T(ours), T(theirs)); ByteArrayOutputStream bo=new ByteArrayOutputStream(50); fmt.formatMerge(bo, r, "B", "O", "T", Constants.CHARACTER_ENCODING); return new String(bo.toByteArray(), Constants.CHARACTER_ENCODING); } + + public static String t(String text) { + StringBuilder r = new StringBuilder(); + for (int i = 0; i < text.length(); i++) { + char c = text.charAt(i); + switch (c) { + case '<': + r.append("<<<<<<< O\n"); + break; + case '=': + r.append("=======\n"); + break; + case '>': + r.append(">>>>>>> T\n"); + break; + default: + r.append(c); + r.append('\n'); + } + } + return r.toString(); + } + + public static RawText T(String text) { + return new RawText(Constants.encode(t(text))); + } + }