Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2014-05-21 06:29:03 -0400
committerAxel Richard2014-05-21 06:29:03 -0400
commitd39b08c6b09e894aab4ab313a92a2177047e2a30 (patch)
treec87a3600450c73f327ede357f575a5b89748bf19 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff
parentd15fea34a69a042cf84b6983cc2b16ebc6536f14 (diff)
downloadorg.eclipse.emf.compare-d39b08c6b09e894aab4ab313a92a2177047e2a30.tar.gz
org.eclipse.emf.compare-d39b08c6b09e894aab4ab313a92a2177047e2a30.tar.xz
org.eclipse.emf.compare-d39b08c6b09e894aab4ab313a92a2177047e2a30.zip
[435376] Conflicted subdiffs shouldn't be merged when CascadingFilter is
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java
index c7b3e85df..1ffe48157 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* 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
@@ -94,13 +94,13 @@ public class ComparisonUtilTest {
leftToRight = false;
subDiffs = ComparisonUtil.getSubDiffs(leftToRight).apply(leftPeriodicalDiff3Way);
- assertEquals(11, Iterables.size(subDiffs));
+ assertEquals(7, Iterables.size(subDiffs));
// Left to right on a deleted element
leftToRight = true;
subDiffs = ComparisonUtil.getSubDiffs(leftToRight).apply(leftPeriodicalDiff3Way);
- assertEquals(8, Iterables.size(subDiffs));
+ assertEquals(7, Iterables.size(subDiffs));
// Right to left on a added element
final Predicate<? super Diff> leftMagazine3Way = and(fromSide(DifferenceSource.LEFT),

Back to the top