Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2016-06-28 09:00:48 -0400
committerLaurent Goubet2016-07-12 10:49:53 -0400
commitd0eb2f08d3ee8ecff54d068a8747ccee5bd69ff3 (patch)
treea2af67873220c00540d5e028b9f5e93b66f0aa40 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit
parent4a548a2ac74e3622bac8c0e08c2e5bcfa12de513 (diff)
downloadorg.eclipse.emf.compare-d0eb2f08d3ee8ecff54d068a8747ccee5bd69ff3.tar.gz
org.eclipse.emf.compare-d0eb2f08d3ee8ecff54d068a8747ccee5bd69ff3.tar.xz
org.eclipse.emf.compare-d0eb2f08d3ee8ecff54d068a8747ccee5bd69ff3.zip
Do not consider a container deletion to conflict with unsets under it
Since a containment deletion and the "unset"(s) under it were seen as a pseudo conflict with each other, we were "hiding" the deletion from view and preventing the merge altogether. This adds an explicit dependency between the core tests and objenesis to avoid failures when launching the build locally (mockito has a transient dependency to objenesis). Change-Id: I8d00c336285480962499d861575815f1c4b72b3d
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestComparisonItemProviderSpec.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestComparisonItemProviderSpec.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestComparisonItemProviderSpec.java
index a51c1e9c1..d4deea039 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestComparisonItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestComparisonItemProviderSpec.java
@@ -47,7 +47,7 @@ public class TestComparisonItemProviderSpec extends AbstractTestCompareItemProvi
Collection<?> children = itemProvider.getChildren(comparison);
- assertEquals(7, children.size());
+ assertEquals(9, children.size());
assertEquals(1, size(filter(children, Match.class)));
assertEquals(1, size(filter(children, MatchResource.class)));
}

Back to the top