Skip to main content
aboutsummaryrefslogblamecommitdiffstats
blob: c2fe41d7a2914cd8170b5c224c52343cbc2f4c7e (plain) (tree)



































































































































                                                                                                     
/*******************************************************************************
 * Copyright (c) 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.compare.tests;

import junit.framework.TestCase;

import org.eclipse.compare.contentmergeviewer.ITokenComparator;
import org.eclipse.compare.internal.DocLineComparator;
import org.eclipse.compare.rangedifferencer.RangeDifference;
import org.eclipse.compare.rangedifferencer.RangeDifferencer;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.Document;


public class RangeDifferencerThreeWayDiffTest extends TestCase {
	
	static final String S= System.getProperty("line.separator"); //$NON-NLS-1$

	public RangeDifferencerThreeWayDiffTest(String name) {
        super(name);
    }
	
	public void testInsertConflict() {
		String a = "A" + S + "B" + S           + "C" + S + "D"; //$NON-NLS-1$
		String l = "A" + S + "B" + S + "x" + S + "C" + S + "D"; //$NON-NLS-1$
		String r = "A" + S + "B" + S + "y" + S + "C" + S + "D"; //$NON-NLS-1$
	
		RangeDifference[] diffs= findRange(a, l, r);

		assertEquals(3, diffs.length);
		assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
		assertEquals(RangeDifference.CONFLICT, diffs[1].kind());
		assertEquals(RangeDifference.NOCHANGE, diffs[2].kind());
	}

	public void testChangeConflict() {
		String a = "A" + S + "B"  + S + "C" + S + "D"; //$NON-NLS-1$
		String l = "A" + S + "b1" + S + "C" + S + "D"; //$NON-NLS-1$
		String r = "A" + S + "b2" + S + "C" + S + "D"; //$NON-NLS-1$
	
		RangeDifference[] diffs= findRange(a, l, r);

		assertEquals(3, diffs.length);
		assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
		assertEquals(RangeDifference.CONFLICT, diffs[1].kind());
		assertEquals(RangeDifference.NOCHANGE, diffs[2].kind());
	}
	
	public void testDeleteAndChangeConflict() {
		String a = "A" + S + "B"  + S + "C"; //$NON-NLS-1$
		String l = "A" + S            + "C"; //$NON-NLS-1$
		String r = "A" + S + "b1" + S + "C"; //$NON-NLS-1$
		
		RangeDifference[] diffs= findRange(a, l, r);
		
		assertEquals(3, diffs.length);
		assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
		assertEquals(RangeDifference.CONFLICT, diffs[1].kind());
		assertEquals(RangeDifference.NOCHANGE, diffs[2].kind());
	}
	
	public void testInsertWithinMultilineChangeConflict() {
		String a = "A" + S + "B" + S           + "C" + S + "D"; //$NON-NLS-1$
		String l = "A" + S + "B" + S + "x" + S + "C" + S + "D"; //$NON-NLS-1$
		String r = "A" + S + "x" + S           + "y" + S + "D"; //$NON-NLS-1$

		RangeDifference[] diffs= findRange(a, l, r);
		
		assertEquals(3, diffs.length);
		assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
		assertEquals(RangeDifference.CONFLICT, diffs[1].kind());
		assertEquals(RangeDifference.NOCHANGE, diffs[2].kind());
	}
	
	public void testAdjoiningChangesNoConflict() {
		String a = "A" + S + "B"  + S + "C"  + S + "D"; //$NON-NLS-1$
		String l = "A" + S + "b1" + S + "C"  + S + "D"; //$NON-NLS-1$
		String r = "A" + S + "B"  + S + "c1" + S + "D"; //$NON-NLS-1$
	
		RangeDifference[] diffs= findRange(a, l, r);

		assertEquals(4, diffs.length);
		assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
		assertEquals(RangeDifference.LEFT, diffs[1].kind());
		assertEquals(RangeDifference.RIGHT, diffs[2].kind());
		assertEquals(RangeDifference.NOCHANGE, diffs[3].kind());
	}

	public void testAdjoiningInsertAndChangeNoConflict() {
		String a = "A" + S + "B" + S            + "C"  + S + "D"; //$NON-NLS-1$
		String l = "A" + S + "B" + S + "x"  + S + "C"  + S + "D"; //$NON-NLS-1$
		String r = "A" + S + "B" + S            + "c1" + S + "D"; //$NON-NLS-1$
		
		RangeDifference[] diffs= findRange(a, l, r);
		
		assertEquals(4, diffs.length);
		assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
		assertEquals(RangeDifference.LEFT, diffs[1].kind());
		assertEquals(RangeDifference.RIGHT, diffs[2].kind());
		assertEquals(RangeDifference.NOCHANGE, diffs[3].kind());
	}

	
	public void testAdjoiningMultilineChangeNoConflict() {
		String a = "A" + S + "B" + S + "C" + S + "D"; //$NON-NLS-1$
		String l = "A" + S + "x" + S + "y" + S + "D"; //$NON-NLS-1$
		String r = "A" + S + "B" + S + "C" + S + "d1"; //$NON-NLS-1$

		RangeDifference[] diffs= findRange(a, l, r);
		
		assertEquals(3, diffs.length);
		assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
		assertEquals(RangeDifference.LEFT, diffs[1].kind());
		assertEquals(RangeDifference.RIGHT, diffs[2].kind());
	}

	private RangeDifference[] findRange(String a, String l, String r) {
		ITokenComparator ancestor= new DocLineComparator(new Document(a), null, false);
		ITokenComparator left= new DocLineComparator(new Document(l), null, false);
		ITokenComparator right= new DocLineComparator(new Document(r), null, false);
		return RangeDifferencer.findRanges(new NullProgressMonitor(), ancestor, left, right);
	}
	
}

Back to the top